From 7fb220ed4fb3f3c113aadb48bc7a5ee3e1a3674e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 7 Feb 2023 22:33:06 -0800 Subject: restoring requests --- .../(app)/[username]/request/[id]/+page.server.js | 5 ++++- .../(app)/[username]/request/[id]/+page.svelte | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'src/routes/(app)/[username]/request/[id]') diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js index 542a3ccb..5fb90bf3 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.server.js +++ b/src/routes/(app)/[username]/request/[id]/+page.server.js @@ -1,8 +1,10 @@ import { auth, get } from '$lib/utils'; import { redirect } from '@sveltejs/kit'; -export let load = async ({ cookies, depends, locals: { user }, params }) => { +export let load = async ({ cookies, depends, params, parent }) => { depends('app:invoice'); + + let { user } = await parent(); if (!user) throw redirect(307, '/login'); let { request } = await get(`/request/${params.id}`, auth(cookies)); @@ -19,5 +21,6 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => { if (request.requester.username === user.username) throw redirect(307, `/send/${id}`); } + return { request }; }; diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte index b061886e..b8dedbfc 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.svelte +++ b/src/routes/(app)/[username]/request/[id]/+page.svelte @@ -1,6 +1,7 @@ -
+
{#if request.recipient_id === user.id} -

+

{$t('payments.sentInvoiceTo')}

@@ -34,13 +35,12 @@

{sat(amount)}

{:else} -

- {$t('payments.sentRequestTo')} -

-
- -

{request.recipient.username}

+
+
+

+ {$t('payments.sentRequestTo')} +

{/if}
@@ -49,4 +49,4 @@
-
{$t('payments.tapAnywhere')}
+
{$t('payments.tapAnywhere')}
-- cgit v1.2.3